From 6f80eee962dc6c8fdf7d0bee5ea74c9e09bea1dc Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 28 Dec 2019 00:08:29 -0500
Subject: [PATCH] window: Complete the popover conversion

---
 gtk/gtkwindow.c | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 608754aca9..c4e60524b9 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -34,7 +34,6 @@
 #include "gtkbuilderprivate.h"
 #include "gtkbutton.h"
 #include "gtkcheckbutton.h"
-#include "gtkcheckmenuitem.h"
 #include "gtkcontainerprivate.h"
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcssiconthemevalueprivate.h"
@@ -55,9 +54,6 @@
 #include "gtkmarshalers.h"
 #include "gtkmessagedialog.h"
 #include "gtkmnemonichash.h"
-#include "gtkmenu.h"
-#include "gtkmenubarprivate.h"
-#include "gtkmenushellprivate.h"
 #include "gtkpointerfocusprivate.h"
 #include "gtkpopovermenuprivate.h"
 #include "gtkmodelbuttonprivate.h"
@@ -65,7 +61,6 @@
 #include "gtkprivate.h"
 #include "gtkroot.h"
 #include "gtknative.h"
-#include "gtkseparatormenuitem.h"
 #include "gtksettings.h"
 #include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"
@@ -6588,8 +6583,8 @@ gtk_window_get_state (GtkWindow *window)
 }
 
 static void
-restore_window_clicked (GtkMenuItem *menuitem,
-                        gpointer     user_data)
+restore_window_clicked (GtkModelButton *button,
+                        gpointer        user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
@@ -6609,8 +6604,8 @@ restore_window_clicked (GtkMenuItem *menuitem,
 }
 
 static void
-move_window_clicked (GtkMenuItem *menuitem,
-                     gpointer     user_data)
+move_window_clicked (GtkModelButton *button,
+                     gpointer        user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
 
@@ -6621,8 +6616,8 @@ move_window_clicked (GtkMenuItem *menuitem,
 }
 
 static void
-resize_window_clicked (GtkMenuItem *menuitem,
-                       gpointer     user_data)
+resize_window_clicked (GtkModelButton *button,
+                       gpointer        user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
 
@@ -6634,8 +6629,8 @@ resize_window_clicked (GtkMenuItem *menuitem,
 }
 
 static void
-minimize_window_clicked (GtkMenuItem *menuitem,
-                         gpointer     user_data)
+minimize_window_clicked (GtkModelButton *button,
+                         gpointer        user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
@@ -6648,8 +6643,8 @@ minimize_window_clicked (GtkMenuItem *menuitem,
 }
 
 static void
-maximize_window_clicked (GtkMenuItem *menuitem,
-                         gpointer     user_data)
+maximize_window_clicked (GtkModelButton *button,
+                         gpointer        user_data)
 {
   GtkWindow *window = GTK_WINDOW (user_data);
   GdkSurfaceState state;
@@ -6663,8 +6658,8 @@ maximize_window_clicked (GtkMenuItem *menuitem,
 }
 
 static void
-ontop_window_clicked (GtkMenuItem *menuitem,
-                      gpointer     user_data)
+ontop_window_clicked (GtkModelButton *button,
+                      gpointer        user_data)
 {
   GtkWindow *window = (GtkWindow *)user_data;
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
@@ -6674,8 +6669,8 @@ ontop_window_clicked (GtkMenuItem *menuitem,
 }
 
 static void
-close_window_clicked (GtkMenuItem *menuitem,
-                      gpointer     user_data)
+close_window_clicked (GtkModelButton *button,
+                      gpointer        user_data)
 {
   GtkWindow *window = (GtkWindow *)user_data;
 
-- 
2.30.2